Redirect libexecdir to /usr/lib (not /usr/lib/${multiarch}) since we don't need multi...

diff --git a/debian/changelog b/debian/changelog
index 5a6cbbc18f0afecbb9a754a8e573a0abae916ba5..90e48c6778e528259308cd2212fef7dec8e3ecc7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ ostree (2016.1+deb-1) UNRELEASED; urgency=medium
   * ostree-grub2: recommend concrete GRUB packages instead of hard-depending
     on a transitional package. This is only a Recommends because you
     could be using some other architecture's grub packages.
+  * Redirect libexecdir to /usr/lib (not /usr/lib/${multiarch}) since we don't
+    need multiarch for anything that's installed there, fixing a broken
+    symlink in ostree-grub2
 
  -- Simon McVittie <smcv@debian.org>  Wed, 27 Jan 2016 13:04:34 +0100
 

diff --git a/debian/ostree-grub2.install b/debian/ostree-grub2.install
index 95085efb0bccea8d56a5f02a3e70b53a59c7fbf4..a4bcce259299070ffa5b7b5567080a119e017665 100644 (file)
--- a/debian/ostree-grub2.install
+++ b/debian/ostree-grub2.install
@@ -1,2 +1,2 @@
 etc/grub.d/15_ostree
-usr/lib/*/ostree/grub2-15_ostree usr/lib/ostree/
+usr/lib/ostree/grub2-15_ostree

diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install
index 2c3436b4ab5637707bab44cad3e0fd9103a13e1e..d536574a58a5b6c4c64e533fb8ba05696be832d8 100644 (file)
--- a/debian/ostree-tests.install
+++ b/debian/ostree-tests.install
@@ -1,2 +1,2 @@
-usr/lib/*/ostree/installed-tests
+usr/lib/ostree/installed-tests
 usr/share/installed-tests/ostree

diff --git a/debian/rules b/debian/rules
index 1db06d847e0c361d57a893c731a0581eaa9910be..3a19733143e854f952ce7b74d2cb7a8639855e42 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ override_dh_auto_configure:
                --disable-silent-rules \
                --enable-gtk-doc \
                --enable-installed-tests \
+               --libexecdir='$${prefix}/lib' \
                --with-dracut \
                --with-grub2 \
                --with-systemdsystemunitdir=/lib/systemd/system \
@@ -25,14 +26,14 @@ override_dh_auto_configure:
 
 override_dh_install:
        rm -f debian/tmp/usr/lib/*/*.la
-       rm -f debian/tmp/usr/lib/*/ostree/installed-tests/*.la
+       rm -f debian/tmp/usr/lib/ostree/installed-tests/*.la
        dh_install --fail-missing
 
 override_dh_fixperms:
        dh_fixperms -X'*.js'
-       chmod -v +x debian/tmp/usr/lib/*/ostree/installed-tests/*.js
-       chmod -v +x debian/tmp/usr/lib/*/ostree/installed-tests/*.py
-       chmod -v +x debian/tmp/usr/lib/*/ostree/installed-tests/*.sh
+       chmod -v +x debian/tmp/usr/lib/ostree/installed-tests/*.js
+       chmod -v +x debian/tmp/usr/lib/ostree/installed-tests/*.py
+       chmod -v +x debian/tmp/usr/lib/ostree/installed-tests/*.sh
 
 override_dh_systemd_start:
        dh_systemd_start --no-start